Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 22:33:07 +0000 (14:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 22:33:07 +0000 (14:33 -0800)
commitbbb49cf3db64db4100065ae3d3dc4179a267d77a
tree0b2eb4738752cf42eaa331e3a08551fda7ef946a
parent5e0805d4483198bd021ae346b79ed8a3325c1017
parent3da929728556532b2c0b42e1f887e2aeac0c0738
Merge from trunk.